Added some JS features