Added annotation based configuration