Changed collision system to support multiple collision types