Added Condition helper
Various fixes/improvements