Good point, we will address this as a part of phase 2 together with shared utility lib.