Added finishing touches for deployment