Initial commit for Pedro's new generic default methods