Improve datasense generated code