Added path navigation into the schema