Support for DOAP
Some design changes