Changes for compatibility