Add more primitve-types / implement Encoder-options