Entity wrapper

Issue #4.