Initial commit for Pedro's generic-default mechanism