Make method more consistent