Get rid of persist method and bean factory in content - on our way to a more independent bean model