Add custom finder + fix few indentation bug