Start to move logic in Factory Methods to Requirejs callbacks