Added more elements

Added more elements to the schema