Added minor schema change handling
Added key drop to handle schema change