Added proper support for built-in operators