EntryComment & Entry mapping working, needs to be refactorized