Moved defined keys up to prevent index conflicts