added support for associations pesistance & new adapters