Decorate resources and collections right way
Update Aepic to 0.0.2