extension points and removing paje dependancies