Changed inheiritance