Added rouding support