Refactoring

Added value list templates
Small changes and fixes