Refactored curator