Refactored director making