CHANGE: Moved Schema Definitions for Tables