Replaced simple block classes with new Block() to make things easier