removed _class suffix from attributes