Removed dependency on typescript