Feature/transitions api