Changes for submit to KnpBUndles