Update methods for newer gems support