Add some aliases
Merge policy is now simple
Add autoload options