Updated to split package out of class