Removed unused ops, added boolean and time terms