Modified to use page model