Include shcema name inside commands