Misc updates including has_one association support