Adjusted associations
Further setup for angular