Feature/inject annotated parameters

This is a merge with latest code form master. There are still some issues.