Track size now is Long
Use Java 7
Extracted common PropertyTagHandler into a base class