Implemented migration support & HybridStorageLayer