Improving metadata managing

this will be the main change in RC2

<!---
@huboard:{"order":5.0}
-->