Changes for deployment