Added shape blocks