Move Entry to a new file
Introduce monitor class