converted everything to new persistence layer