added key and udid splitting