Changed some entry types.
Merge pull request #5 from Kapeli/master

Entry type changes