Move schema related methods into own helper
Use new schema helper