Goncalo/features/custom occurrences