Adding constants to generation
Adding defaults and finishing the const code