Added boolean and along with other changes