Added oneliners support