Modified __init__ for standalone