Added sample2 + Modified sample 1 + worked on Entities.java