Changes for full use of requireJS