Modified non-api user methods