Adding selector builder and operations map