POO fixed for API