Adds usage tracking, fixes #58