Remove category enum, ability to change type