Added Map and Property Bean Types to CI and Setter Injection