Added boost program option handling