Adopt to new syntax