Added source support to blocks