Added delegation configuration options and wrote a test
Implemented usage of the delegation handler