Add bundle aware API for querying instruction properties and switch the code