Enhancement to parameter handling and fixed review comments