Added API functionality

These will need an `@private` as well