Added more flexible Vello interface mapping

Change-Id: I0f8876fc149209a411284f7af3719cd3567bf1bb