Adding funcionalities to address planning.