Added option to choose active services