Moved shared constants into Constants class