Moved method to helper