from_model and __init__ updated