Added: Support for index and group callbacks