Added types in options