Update code. Make him more readable. Add to dao create method and other fixes...