Added associations for order and user