Split by "." fix & duplicated methods removed