Fixed paths so they will be more generic