More optimizations for NO_NODE compatibility
Added definition for Date