Adding Entry class from hongwei mac