Refactored Type to KeeperType