Continued Require JS improvements