Add macros for long and string
Update TODO