Replace methods with table