Handle parameters better
Support common parameters