Fixes base dir reference and adds support for QuickAction

Fixes base dir reference and adds support for QuickAction