Implemented ability to track users