Add angular service and normalize