Add conditionals for new methods