Entity SP: new features and fixes