Fixed create, update trackings