reorganisated the associations and improved the attribute exploration