Update feature: Some added functionality for migrations and cleanup