#23 Separate blocks table
Fixed table creation code