WIP hot deploy support