Added ability to define default schema