Updated teh API to match the implementation so far