Added values management and fixed minor issues with attribute management