API simplifcation
Merge branch 'API'