Setup procedure added