Fix and add core methods