Development

Some changes in API