v2.1: Adding ajax support