Removed block class dependency