Added more JS features