Change to abstract class/methods