Add backward compatibility methods
Fix tests
Add prepare expressions