Add annotation support and update file handling
---