Include non clustered Blocks; Extended Template; Updated Blocks.cs