Schema fix + Dao initial commit