Extended more parts for rails upgrade