Made client more customizable
Simplified DispositionType handling internally
Minor update