Added annotation and corrected automapping ordering