1. Added logger
2. Changed tracking method