Moved _static and _source to static and source