Changes to allow packaging