Issue #174 - Modify API endPoint