Change the way setter are searched.
Fix return types.