Added elvis method support