More package and setup work