Added a basic user tracking facility