added arrays support