Add remaining keywords, add rdmd in execute