Moved block definition into their own table for performance and separation concerns