Takes into account the inheritance accross module issue - View it on GitHub