Moved items into helpers