Added CMD and Entrypoint back