added latest schema (cleaned up)