Some changes for more convenient view added