Refactor done for BlocksterObject