Move statics to main app