Change only class to more standard Base