Updated __init__.py with convenience imports