Added OFFSET builder part and some tests