Drop RefSupport for better performance
Fix 29 or 30 DATE
Update test cases