Refactor this to use the Base enum