Add in initial support for schemas