Added DB support + preparation to apply hibernate