Feature/add missing functions