Added mandatory class to clean-up display
Fixed adding packages