Add refactored method