Added base Command Based Template