Added JS OOP