Rework on custom package