Move first parameter for the callbacks, and support standard & support fragments
Rename of some classes