Changed method names and added compatibility handlers