Move to __init__ for import