Added some additional stuff, especially for vivo_admin