Added logic for methods