Improved constant declarations
Character type added