Refactored to use \Acid more