Moved schemas inline into classes to increase readability