Cleaned up how Delegates are added