Common functions update