Policy factory added
Exception classes are slightly reworked