Add params class
Merge with remote