Added conditional record definition