Added some rudimentary schema support