Move schema related methods into own helper
Use new schema helper
Merge branch 'refs/heads/schema_helper'

* refs/heads/schema_helper:
  Use new schema helper
  Move schema related methods into own helper