Added block logic support;