Adding router for image members

Change-Id: I07eb0879437ad42c59deb2c29c636827cd91a2cc
Minor fixes

Change-Id: I8b242fc6ca097e3dde94d1f64f43768868545435