Changed Property type to boolean and changed labels