Cleaned up pages integration and add isType variable setting