added rails 4 compatible associations