Added 'expand_string' method to model class