Revamped for redmine 2.x