[MOD] redefined to work for standalone and maven deployment