Added support for FUNCTION and requirejs