Anotate models added. Some adjustments to rake needed fro gem