JCR-2094 : Refactoring code source