Initial changes for Rail 4.0