UAR-606 Refactored a bit to add serialVersionUID for serializable and moved some of the string constants to a constants class.