Adding to build and package