More param command related improvements