Changed type/group/op options, to make it simpler and make more sense