Fixed paths and made it generic