Improving Material class