Adding functionality and proxy