Adds singleton methods support