Added flexible and secure API layer