Added block id support