fixing for new orm structure
trying to fix setup and old functionality