PROMOS - Refactor