Fixed call trace, removed unnecessary  attribute
CRUD moved to module