Some formatting changes. allow support for hibernate factory