Add new annotations support
Remove wildcard import