Still going in the refactoring of querysets and reorganizing the codes.