SCRIBBLE-151 Further refactoring to simplify api