Improved utility methods