merged cpabe-0.11 to use their existing classes.