Added wrappers and dtos (thanks snowl)