Updated non-generated methods