Added nullable to locked property