Rac support - Resolve #40