Added annotation support and auto hostaname annotation