Added planned functionality