Clean up method signatures: use entity when available