Added basic item and block classes