Sergey/metabar improvements