Closes #241 Collision types refactored to be more clear