Moved block class to a generic block class