Adding todos for future improvements