Improves annotation support (#161)