Complete resolved implementation