Fixes #13 - Support data expression