moved parser code away from data schema container classes