Add data types
Remove evaluate from flash client