First commit that contains some features of API