added a full support of slabs