Changes for deployability