Added base block and item classes