Improve injection handling of property key containing dots...

Use Configuration Injection where it makes sense. Add @Property annotation to provide better metatype information.