Start working on extend functionality