Fixing generics messages api