Added fragment Support