Added support of swap and is_* functions