Attempt to improve autowiring