Adding prefix support

Change-Id: I50c1208bdb4ab7a57f17da67f9c31d09d660fdab