model annotations now also generic (see issue for heiko); toying with names