Some changes on custom methods for compatibility.