Added fixes and usecases