CHANGE: Add methods for better compatibility