Changed way block type is stored so it can be extended later
Added ability to add a new block type