Port Constraint

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>
Port ContactPoint

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>