Continued refactoring credential related pages objects