Added IP address capability
Added TOKEN configuration parameter
Annotations update