Some changes for comfortable programming