non functional database parser added, classes renamed