Added nullables