Added an internal api (just the start)