Change array definitions for compatibility