Improve block creation