Changes for deployement to cf