Added more packages

Clean up in code