Added + sign
More work on generating constant declarations