Separate some code between common and default