Some updates for future features