added the rest of the types and pages