Small changes to API - lot's to do