Code improvements, BaseOptions fix