Added tracking constraints