Update to 0.3.0
Handle multiple entries