Updated to include null tables for js functions.