Initial attempt to add auto-release support