updated schema and added in if applicable and expanded