Separated application add and get into separate classes