optimised singleton useage
resolved constants into constant class