Trying to maky configure more felxible