Moved Persistence-specific methods to the bottom and added comments