Split for dev and package versions