Some fixes

Single quotes support
Pre and post execute expressions