Functional code added for the changelog (needs work and refactorization)