Initial work for deployment under cap3