Add better javascript support