[To-Do] Added entries