major structure change for better deployment mechanism