UAR-606

Should we consider making these beans abstract in the case we have the opportunity to push this upstream?