Add associations and authentication