Refactored to use annotations, for speed, and fixed selection of currently deployed charm unit