Propositos DAO DTO ect
Merge origin/master