Behavior type hardcode removed