Added entities missing from current implementation.