More features, simplified data model a bit
Added icon