Added tracking and clean up