Switch for protoype oriented implementetion and fix issue with spaces in options