Some api and frontend changes