switching to annotation driven configuration