1. Changed ant property mapping to annotations
2. Convention mapping to all tasks