Moved code to config variables (from inline)