Implemented And/Or using templates.
Some annotations in templates.