DO NOT MERGE: Feature/static columns