Added some block creation logic