Update for page types and Api JSON model