Moved some code to the outline library