Updated with drupalgap content