Added percentage support