Changes to work with cactus