Added absolute path support