Added fragments and some classes