adding more schema and lexemes
simplify and spacify