added types annotations and keywords o xml