Latest Minor Changes for Activity + generic