Changed OOP and samples