Add nullables and index