Added Constants only class and update to use it.