Changed to use base path