Added more to methods