moved hardcoded values in configuration