Feature/associated users