More work on deployment system