Fixes for new implementation. Use meta concept, cleaner.