Added the ability to override logic