UML-243: Fix association class mapping