Move some Feature logic into a module