Add Federica's features to the __init__