Added default controller & config