Slight refactor of Thing model