API Simplify Sprint 14

Simplifying the API as discussed during Sprint 13 review.