Move statics to common app