Added basic functions and tracking