Moved last dynamic pieces to generic file