Added block and item base classes