Some changes for angularjs