Simplified the context handling and changed the way points pools are
modified.