Auto-generation update.
Velocity properties has MOVED to under vm/.
Layout change to method headers for readability.