Make Queue work with new types.go