Updated __init__ method