Version No related code refactoring