Added JOINs and PARTs handling; changed the default name also.