WIP - Add schema support