Fixed select CI and add CI methods