Added tracking capabilities