Refactor @Deployment method