Add amesh feature
Fix options