Fixed require ordering and usage