Updated to use Boost PO