Added callback and requirements
Bugfix