Refactor entry creation into Entries class