Some polish of the core methods