Plaza2Adapter refactored. Unnecessary complexity removed.