Added computational expressions and aws tables