Changed backend API for consistency