Move things around for compatibility with vico