This also changes the upsert method to insert on the BlockDataHandler, this is piece for fixing the bug #6