Update to follow current state in documentations
Simplify SQLAlchemy API usage