Add type property to blocks. Make types camelCase.