Refactored to add no_release support