Added jaxb annotations, renamed abstract class.