Strip down to basic API functions