Added desired future features