Features updates from dev