Change Entry class to accept options