#5 added support for image annotations, selectors and states