Add checks for full filename or not