feat(builder): adding types and improving parse