Added dots and dot support