Entity wrapper

Issue #2