Added time, date, datetime, key-value expressions
optimized build for heroku