Lxc refactor