Fixing small issues

Stabilized the way many to many adapter store data
Added PSD support for images.