Move prop reference to runtime
Move static variable reference to runtime