#59 Moved setting up of composite to asynctask