added entity Entity to core data, closes #24