eCommerce enhancements

Thanks, I agree. @asadiqbal08 or @muhhshoaib can you remove that restriction?