Upgraded to SQLAlchemy 0.9.7