Making message repository DI compliant
Moving input filters out of entites to make system more DI compliant