Feature/split role of vps