Modularity to coffeescript added