Add new features and less code