Added annotate and uglify