Adding v2 admin support for 1.4