Additional interaction arguments support added