Refactored configuration
Put back new suggested packages