Added new blocks and lamp