Added Support for additional constant types - major reworking (lots more Reflection)