Feature/helper methods