Simplify code and omit schema