Better JS support and organization