Added to usecase and added more getters and other methods