Updated block classes