Add again cmdline and base