Goncalo/improvements/custom occurrences