~ Code quality improved
+ Support for policy type, this closes issue #6