Refactor activity entry mapping
Load Activity