Added missing definitions