added associations enum and more fixes