Refactored factories. :)