Changes for frontend use