Update annotation config and custom persistence handler for Page to be compatible with collection refactor