Cleaned up schema