Added Usage tracking