Cleaned up structure, started checking directflow entries